Auto merge of #2391 - alexcrichton:update, r=alexcrichton
authorbors <bors@rust-lang.org>
Wed, 17 Feb 2016 18:50:52 +0000 (18:50 +0000)
committerbors <bors@rust-lang.org>
Wed, 17 Feb 2016 18:50:52 +0000 (18:50 +0000)
commitefc74a636021c35276d3c507715967ae9cc7970b
tree1502016e6febe0dea2d3514b378c048f715abf12
parent1a22370fcb7242f662095ed314c47c2671d53dfa
parente5b818bf8a3e91042333c4af09832dd653c2df17
Auto merge of #2391 - alexcrichton:update, r=alexcrichton

Fixes compile on nightly